fixed merge conflict
Merge pull request #37 from mcpike/master

fixed merge conflict