sebkopf Merge pull request #3 from KopfLab/dev