Merge branch 'testing'
Merge branch 'master' of github.com:ManuelSchneid3r/albert