jamesob Merge pull request #5 from jenstrange/master …