Refactoring code and increasing Test coverage.
Merge pull request #14 from fogbow/develop

Refactoring code and increasing Test coverage.