Merging Roni's TRSP fixes and enhancements.
Merge branch 'develop' into trsp-improvements
Merge branch 'develop' into trsp-improvements
Merge branch 'trsp-improvements' into develop
Fix for issue #215 plus some additional code to add some future new features.