Other changes: * Removed all references to Altona * Refactored the Makefile to avoid code duplication