WIP - improving robustness of loading mechanisms
Merge branch 'master' into gh-pages