Refactoring

Resharper fixes
Improve test coverage
Merge pull request #10 from ifanatic/develop

Develop