Merge pull request #76 from mcpike/master

fixed merge conflict