Initial commit
Updates description and requirements
fixes merge conflict