Problem: RFC was broken
Solution: Rewrote it to the current implementation
Merge pull request #26 from FreekPaans/master

Problem: RFC was broken