Bug Fixes.
Merge pull request #21 from ranjan/dev

Bug Fixes.