Update Master to 0.1.2