Added changes so far for 0.6.1.