Merge pull request #6 from PdxCodeGuild/master