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