Closes #443
Merge pull request #444 from dim0v/develop

fixes #443