Forward port from RSU

Fixes issues: #3, #4, #5, #6 and #8