1.2 Final Commit

Thanks to Rie!