IntelliJ Test Commit
added some documentation. Reverted to curly braces at line beginning
Merge remote-tracking branch 'origin/master'