formatting
code cleanup
no more beta version
Merge branch 'master' into beta
version => 2.0