Merge pull request #26 from jiribroulik/master

billing fix