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

Fix type errors