Changed to version 2.0 for GA release