Merge pull request #17 from mil-tokyo/saito

Saito
Merge branch 'master' into saito