Merge pull request #3 from CliffordAnderson/master

updating master aug 1