Merge pull request #2 from jimmayhugh/master