Merge pull request #5 from PdxCodeGuild/master