Develop

We can make this the master branch now and create a branch for the 1.0 version