selection and bug fix
Merge pull request #6 from mmarionncern/MPAF_MM111014

selection and bug fix