graemeleehickey Merge pull request #50 from petephilipson/master