Merge pull request #3 from LukeTillman/master

Schema Update
Merge remote-tracking branch 'remotes/upstream/master'