dev end
end
master
Merge branch '2.0.0'

Conflicts:
	README