Fixing pedantic warnings
Merge pull request #9 from aselle/master

Warning fix