fwessels Take fix from issue #9

Latest commit 61af18e

Jun 7, 2018