Fix
Merge pull request #23 from egisatoshi/develop

Fix