Wrap domain logic
Merge pull request #1 from fantix/master

Wrap domain logic