Pulling ELLIE upgrades into the master branch