Merged in 0.2 code