Fix merge issues
Merge pull request #19 from andrew13/patch-2

Fix merge issues