Cleaned up and changed Version to 1.0