Update to work with latest nightly
Merge pull request #68 from brson/master

Update to work with latest nightly