Add changes for 0.1.12, prepare for next iteration