Stephen Chiang acceptance and unit tests, also modified readme