Merge pull request #3 from lrsaigopal/development

Development
There were a lot of bugs due to the new additions. Reverted them back
Merge pull request #13 from shenoyvvarun/development

Development