updated to right rfc
more wtf support
Merge pull request #21 from mafintosh/master

more stuff for the rfc