Merge pull request #6 from jlmichael/master

Merge master back to Integration.
Fixed broken integration test.
New release candidate