Fixed compiler error and warnings
Merge pull request #18 from ronnieholm/master

Fixed compiler error and warnings