Merge pull request #5 from keithknox/master

hopefully this will work