Merge pull request #6 from cavedude00/master

merge from cavedude00:master
more clean ups from merge.
Merge pull request #244 from regneq/master

merge from regneq:master