fixed conflict
Merge pull request #15 from davecramer/master

fixed conflict and other errors