Updated merge
0.3.1
Fixed merge conflict