Merge pull request #79 from jerv13/master

Moved loading to last event
Merge remote-tracking branch 'upstream/master'