quick-n-dirty API fix(?)
Merge pull request #339 from nelenkov/dev

quick-n-dirty API fix(?)