Merge pull request #283 from bitol-io/simonharrer-patch-3