bugfixes
Merge branches 'master' and 'testing'