Major changes
New stuff
Merge pull request #1 from ryancw/rw-new-stuff

Major changes