* Better handling of rstisms replace tags more intelligently to make things more readable unit tests + minor adjustments
Brian Coca