Fixed compiler warnings
Merge pull request #142 from adrian17/master

Fixed compiler warnings