Fix for issue #280
Merge pull request #281 from smfreegard/master

Fix for issue #280