initial test merge to upstream fork

be sure to change CNAME