Updating 7

Merge pull request #8 from CliffordAnderson/master