Merge pull request #2 from MichaelTunnell/master

updating my fork