adokter Merge pull request #410 from adokter/develop