Design fixes
Merge branch 'master' of https://github.com/edlongman/whileaway