Major changes, ready for release 0.1.0