Upgraded to version 7.1.4 and added some functionality