Merge pull request #7 from PdxCodeGuild/master