Bug fixes.
Merge pull request #20 from swapnilvkotwal/development

Bug fixes.