minor step towards compact working
Merge origin/master