Point at correct host
Compiled Version
Merge master into compiled