Merge pull request #6 from markusgeiss/develop

fix for ATEN-480