nathanalam Merge pull request #54 from liamdj/namechange