Merge pull request #104 from aeberspaecher/develop