use c++0x standard for better compatibility
Merge branch 'develop'
Merge branch 'master' into develop