Merge pull request #4 from techdivision/master

Merge techdivision/master into wagnert/master
some minor annotation changes
mergin upstream changes