Merge pull request #104 from Minrog/master

2.04.0:minrog:6 BA Partial Merge