Merge pull request #25 from da2ce7/master

update to documentation, defines, and other work.