Fixing loading
Merge branch 'master' into edge
Fixing for abaaso 3.6.6
Merge pull request #54 from avoidwork/edge

Minor fix