Merge pull request #34 from elzaggo/develop

Fixes #31