closes #27
closes #13
closes #20
closes #30
Merge pull request #33 from dushyant89/master

Closes 27,13 and 20