ruipgil Merge pull request #66 from andrewho83/patch-1