Fixed Merge Changes

Various things went wrong with the merging. I fixed them.
Merge pull request #7 from igraham/master

2nd copy of master