better code hopefully
Merge branch 'master' into configuration