backwards compatibility
Merge pull request #337 from HannesRempel/master

backwards compatibility