Merge pull request #11 from plus3network/master

Separate Out the Integration Tests
Trying to make the tests more reliable
Merge remote-tracking branch 'upstream/master'