Updated setup, ready for release