Fix #81 and merge RTL changes