just a Zwischencommit
Merge branch 'dev' of github.com:TimoKramer/jacap into dev