Merge pull request #2 from PdxCodeGuild/master