Merge current code into 0.2