Merge pull request #3 from PdxCodeGuild/master