Fix for issue number 208
Merge pull request #220 from bijugs/fix_issue_208

Fix for issue number 208