Refactoring of code
Merge pull request #56 from TaviscaSolutions/changes

Refactoring of code