Merge pull request #5 from bitsculpt/dan-branch

Dan branch
Merge pull request #6 from bitsculpt/dan-branch

All tests work! Yay!