Updated Master to version 2.0