Merge conflict fix v0.1.2
Actualized to v0.1.2