Changes recommended by Lisa Ballard at PyLadies via Steve Piercy, thanks Lisa!
Merge remote-tracking branch 'origin/master'