Merge pull request #2 from Offshore-SBA/master

Merge pull request #1 from Offshore-SBA/uehara-fix
Merge pull request #5 from Offshore-SBA/uehara-fix

Merge pull request #2 from Offshore-SBA/master