Fix some warnings/errors
Merge pull request #8 from deizel/develop

Fix some warnings/errors