lbau7 Merge pull request #32 from imbi-heidelberg/general