0.9.5: Cleanups, new license, merge of python version to master