fixes #129
Merge pull request #154 from privateip/develop

fixes #129