Merge pull request #14 from vhordejcuk/master

MoRe
Refactoring
Reporter, refactoring, etc.