Merge pull request #3 from rmelick/master

Fixes for REGISTER and RMF statements
Merge remote-tracking branch 'upstream/master'