Merge pull request #1 from rsmudge/master

finally updating my fork (again)