0.3.3 Cleaned up everything, ready for publish