Merge pull request #3 from roomblocker/dev

Dev->Master merge 9/8