Merged changes from upstream, added the project description to README.md