synchronization with master branch
formatting
Merge branch 'master' into beta