Merge pull request #767 from ZappoMan/master

fixed compiler warnings