Merge pull request #69 from blishs/master

Fix compiler warnings