Merge heads
Fix test runner
Merge branch '0.1'