Merge pull request #60 from cbmi/integration_test

Merge Integration Test into Master