Merge pull request #309 from bitol-io/simonharrer-patch-1