Initial commit of version 2.0.0.4