merged - local change was excepting a typerror and giving a warning
merged - local change was excepting a typerror and giving a warning

markusrademacher/datahandling,AshleySetter/datahandling,AshleySetter/datahandling,markusrademacher/datahandling,AshleySetter/optoanalysis,AshleySetter/optoanalysis