Updated to generic version
Updated README