Fixed compiler errors and warnings
Merge pull request #1 from msteiger/master

Fixed compiler errors and warnings