Merge pull request #250 from RobertFewins-Kalb/master

Nice work, @RobertFewins-Kalb! A quality job indeed!