fixes part of #86
Merge pull request #115 from AlexanderPico/master

fixes part of #86