Merge pull request #1 from jamesrhaley/master

merge with james