fixed 2 issues.
Merge pull request #3 from ryochin/fix

fixed 2 issues.