fixed formatting
fixed formatting (to eclipse)
Merge branch 'master' into sydni-new