michelpereira Merge pull request #60 from andrewdmaclean/patch-1