tonymorris Merge pull request #1 from alexjago/master