Fixed various warnings
Merge pull request #3 from brynbodayle/master

Fixed various warnings