small tweaks/testing w/ Timo
Merge branch 'master' into develop