Update

Updating files to latest version after some difficulty with github that
caused them not to be updated