v1.0.0 New class output, bug fixes etc.