Update 0.12.1

- Code cleaned and branch fixed.