Fixes #103.
rebased onto c3f31374d3272ef2fe9d1cd54a060455dc310783
Pull-Request has been merged by pbokoc
Fixes #103.