Fixed warnings
Merge pull request #54 from ozkriff/master

Fixed warnings