misc
Merge branch 'master' of https://github.com/ado60/quadrat
conflict resolved