Merge branch 'master' of serpens.sternwarte.uni-erlangen.de:remeis/isisscripts into emcee_new