fix bug #27
Merge pull request #37 from git-training-20140918/issues/27_fix-bug-maki

fix bug #27