Fix for issue 228
Merge pull request #229 from bijugs/fix_issue_228

Fix for issue 228