Fix for issue 217
Merge pull request #221 from bijugs/fix_issue_217

Fix for issue #217