Conor Sheridan changes
Merge pull request #28 from conorsheridan/master

Conor Sheridan changes