Fixing up R4iSCAM
Merge branch 'IPHC-developer' of github.com:smartell/iSCAM into IPHC-developer