stef-levesque Merge pull request #15 from catfist/master