Fix for issue 210
Merge pull request #211 from bijugs/fix_issue_210

Fix for issue #210