Merge pull request #75 from LocutusOfBorg/master

Fix for issue #74
Merge remote-tracking branch 'upstream/master'