Revert "Improvements"
Merge pull request #50 from cobaltcrm/revert-49-master

Revert "Improvements"