RE updates
Manual updates (old again and new manual updates)
Merge pull request #50 from confpub/master

RE - final updates