Merge pull request #10 from chewbacco/master

simple integration tests
Merge pull request #11 from chewbacco/feature/more-tests

Merge pull request #10 from chewbacco/master