Christian Kienle Merge pull request #50 from ChristianKienle/develop