Fixes #4
rebased onto 8ec85f4f5ad80467fb4f1d3962a39a4e85670c58
Pull-Request has been merged by mkoncek
Fixes #4