Fixes
Merge pull request #100 from niravpatel2008/developer

Fixes