refs #57 - merge to master (removed ListOf handling)