fix for #152
Merge pull request #157 from panique/develop

fix for #152