solves #146
Merge pull request #147 from davidverholen/master

 solves #146