Fix for issue #224
Merge pull request #225 from amithkanand/issue_224

Fix for issue #224