Factories are even more bitchin' than before now.
Merge branch 'master' of https://github.com/ManOfTeflon/koala

Conflicts:
	test.cc