refactor loading objects
Merge branch 'master' of github.com:DavidSaxon/M.A.F.I.A