Cleanup
replaced boost::lexical_cast with std::to_string
Removed const to calm ICC
Merge branch 'release/0.8.1'