Merge pull request #110 from vkhatri/master

preparing for v2.1