Cleaned up
Increased version numbers