Fix type errors
Merge pull request #3 from egisatoshi/develop

Fix type errors