Merge pull request #7 from keithknox/master

final pull request