Updated and tested code, so this should be a stable 0.1.0