Changes recommended by @ivanherman. Add diff to previous version.