fixed missing /
Merge branch 'master' into testing
a few bug fixes