Updating to fall in line with pre1 spec
Merge pull request #1 from braker1nine/master

Made some changes to fall in line with the updated spec