Merge pull request #103 from LocutusOfBorg/master

Fix for issue #102