Merge pull request #41 from dizzzz/develop

Sync work