Updated to v1.2
Updated to v1.2
Updated to v1.2

fixed small bug
Fix
Fix .gitignore merge conflict