Upgraded to 0.8.2 and fixed (some) errors
fixed conflicts

Conflicts:
	README.md