compiles properly now
Merge pull request #94 from duralog/master

compiles properly now