Fix for issue #199
Merge pull request #200 from bijugs/fix-issue-199

Fix for issue #199