Merge pull request #7 from burkeholland/master

Merge
Merge pull request #47 from fujiy/master

Merge pull request #7 from burkeholland/master