Updated modules constructors. Main::load method updated.
Merge branch 'feature' into dev