Last minute changes.
Merge pull request #18 from beasly/blox

Last minute changes.