Integrating feature request from issue #26

The people have spoken:  https://github.com/panicsteve/cloud-to-butt/issues/26