Merge pull request #15 from bitsculpt/dan-branch

Dan branch