Merge pull request #143 from bitol-io/tomdw-patch-1