Initial commit of version 2.0