Fix merge bug
Merge pull request #4 from ratash/master

Fix merge bug