Merge pull request #3 from jackjennings/master

update from master
Merge remote-tracking branch 'upstream/master'
preparation for the next RF update
Merge pull request #3 from typemytype/master

preparation for the next RF update