Integration testing
Merge pull request #102 from cristianbica/integration_tests

Integration testing