Changes since tag v1.1.2

commit fe2740d078bd73cc05216452d401c598e4277d0f
Author: Kyle Buller <bullerk@gmail.com>
Date:   Tue Jul 17 10:55:48 2018 -0500

    Fix loading

