Updated to v1.0 Fixed all errors