Tony's role, Stephen's role
Merge pull request #23 from jasondreyzehner/master

Tony's role, Stephen's role