issue -i#4
fixed conflict
Merge pull request #6 from usatie/momoe_git

issue -i#4