close to final
Merge pull request #27 from niwatoribaka/master

close to final