removes most compile-time warnings
Merge pull request #118 from r3dunlop/master

removes most compile-time warnings