support for new rfc
Merge pull request #19 from mafintosh/master

support for new rfc