Merge pull request #260 from PVSec/master

Fix for issue #258