Pull from Kumaran's Fork

Top-up scripts included for eppic version 2.1.2