Merge pull request #3 from txdavidtx/master

Merging ALL