Merge pull request #92 from ihptru/master

tweak models and api a bit