fixed #135
Merge pull request #136 from kayac/develop

fixed #135