formatting
Merge branch 'master' into beta
removed debugg printings
synchronization with master branch