Merge from 0.2.0, oops.
	- Fix obfuscation