Make whole tool C++11 independent
Fix small issue and kill some white space
Merge pull request #33 from jeroenk/C++11

Make whole tool C++11 independent