SOCIALLI-23: Polish/formatting
Merge pull request #40 from habuma/master

SOCIALLI-23: Polish and formatting