Adding alises

Conflicts:
	src/main/PMAWrapper.java
Fixing merge bugs