Merge pull request #415 from wgerlach/develop

new api