Updates for RE
Merge pull request #97 from confpub/master

Updates for RE