Geoff Rivell:
	More configurable options and Atlas support thanks to Daf's work!
