Deffered loading scripts
Merge pull request #29 from korczis/master

Merge Master to Stable