Develop

We're nearing the first release of MINX. Once this is merged any new features are not going to be included in 1.0