a master bug fix
Merge branch 'master' of github.com:thespacedoctor/test into r2_features