replaced with single calls
Merge pull request #39 from philipooo/master

replaced with single calls