graemeleehickey Merge pull request #42 from graemeleehickey/master