fix #1

This reflects latest changes from domain hopping to address and close #1 (closed).

This branch is currently live on slides.solidbase.info