Merge pull request #230 from wernsaar/develop