fix #271
Merge remote-tracking branch 'kazu/master'