Fixes #146
@lholecek can you rebase? lgtm otherwise! Thanks!
rebased onto 08ff5e352eb646ebd3a279a2f81d73d262de188a
Pull-Request has been merged by lholecek
Rebased and merged.
Fixes #146