Couple of changes.

Hey Andrew,
Here is your first pull request!
I made a couple of modifications and added a new file.
Enjoy.
Dan