Merge pull request #8 from sitle/develop

Fix issue #4