Refactoring
Reporter, refactoring, etc.
Merge pull request #15 from vhordejcuk/master

MoRReee