bugfix
Merge pull request #25 from suzunone/feature/bugfix_20140909

bugfix