fixed #64 and #70
Merge pull request #74 from watarumohawk/issue64_70

fixed #64 and #70