class REXP implements java.io.Serializable
Merge origin/master

Conflicts:
	REXP.java