Added everything in v1.0. That's the code before the new version