Clean up some warnings
Merge pull request #315 from chinhodado/master

Clean up some warnings