1.2.0

update latest changes from merchello