Merge pull request #302 from b97pla/develop

Develop
Merge pull request #303 from b97pla/develop

Develop
worked around a very interesting bug with a variable not being cleared between function calls