Fixed iss 6 and cleaned up README