Compiler warnings etc.
Merge pull request #73 from swillits/master

Compiler warnings etc.