fix #20
Merge pull request #51 from kou-ishizaki/yamabranch_20141112

fix #20