Fixing loading bug.
Merge branch 'master' into development
Merge branch 'development' of github.com:dchbx/gluedb into development