Uchida

#37 pull request