:)
:)
:)
Merge tag 'v.1.2' into v.1.2

Conflicts:
	README.md
Merge remote-tracking branch 'origin/v.1.2'

Conflicts:
	README.md