Merge pull request #1 from Sean-OShea/master

I want to pull this to you
jeje wants to commit