Making changes
Needs to go into master.
New commit
Merge pull request #7 from clint318/master

Put it all in!