sholsapp:master with a few minor tweaks

Updates #22