Revert "Major changes"
Merge pull request #105 from denivip/revert-104-master

Revert "Major changes"