pull from cyphis: patch-1

Update per tips from a friendly gitter