Merge pull request #26 from FreekPaans/master

Problem: RFC was broken