Minor adjustment in coding
Updated tables with labels
Merge https://github.com/rikardq/rimi