warning and some codestyle fixes
Merge pull request #2 from dakk/master

Warning and some codestyle fixes in main.cpp