fixes for merge issues
Merge pull request #44 from ryanricig/master

Merge