Some generalization
Merge pull request #5 from nikolay/dev

v0.1.6-beta