Merge pull request #453 from wernsaar/develop