Changes since tag v1.2.4

commit 30be7964a84f119b6fabc10577f0123afefdd146
Author: Erik Vonderscheer <evonder@gmail.com>
Date:   Sat Jun 24 01:23:22 2017 -0700

    Code cleanup - untested logic for newer versions

