Fixed loading.
Merge branch 'release-1.1' into development
Merge branch 'development' of github.com:dchbx/gluedb into development