0.1.0 - merge in @brutalhonesty changes