added test, modified readme
manual merge