Fix for issue 234
Merge pull request #235 from bijugs/fix_issue_234

Fix for issue 234