Made config path more robust
Cross-origin get of JS is probably important
Merge branch 'develop'