MJ: merge changes
MJ:merge
Remo/MJ : Completed #1588 Reverting work on #1246
Merge branch 'master' of https://github.com/JamesMura/RapidFTR into pull-req-359
fixng test