Fixes #1

Fixes Issue #1 and Main.Load() event