Made the program faster and it now survives R CMD check
Fixed a small bug
Fixed another bug
factored test for PSI-MS compliant intrument names out