First full version! Updated to v1.0