Updates to account for changes to the SW spec.
Merge pull request #1 from jeffposnick/v0.0.7

Updates to account for changes to the SW spec.