Merge pull request #139 from bitol-io/simonharrer-patch-2