Get rid of test.support
Merge branch '0.1'