Work in progress
Merge branch 'master' of github.com:dtgorski/wray into dev