Fix for issue #283
Merge pull request #319 from c4xp/master

Fix for issue #283