Resolved all compilation warnings
Merge pull request #1 from mattkelly/master

Resolved all compilation warnings