Merge pull request #1 from brson/master

merge brson's work
RFCs stuff
Merge pull request #1 from Gankro/master

RFCs stuff