included modified files from recent additions and improvements (and removed convert.R)