integration tests passing
Merge pull request #25 from dglunz/integration_test_complete

integration tests passing