Merge pull request #8 from jlmichael/master

Merge master back to integration - bah.
New release candidate