Mess around with the tie shapes a bit more
Merge branch 'master' into gh-pages
Build