Fixed warnings
Merge pull request #58 from choefele/fix-warnings

Fixed warnings