Revert "Shit happens #5"
Merge pull request #3 from prakashpp/revert-2-develop

Revert "Shit happens #5"