Fixes #119
rebased onto 2f7c3863514d983297e1e57cfb60f915b293ff7e
Pull-Request has been merged by ppisar
Fixes #119