Small fixes
Merge pull request #3 from tadatuta/master

Small fixes