Fixes
Merge pull request #210 from akshay9/master

Fixes