Merge pull request #6 from gnedov/preMaster

merge preMaster -> Andr brannch
changes acc. to[vtegza] comments
+format code [Ctrl+Alt+L]
Merge pull request #8 from gnedov/Andr

[Andr] to preMaster