Merge pull request #18 from chirag04/master

fixes #16, #17 and #20
version 0.7.0