Merge pull request #16 from johnvanloon/master

Simple solution for the RFC.