Support for CPU alignment from Chad Goodman

Conflicts:
	Makefile