aagh ds_store go away
Merge branch 'master' into develop, because I say so
get resolved:
cleanup syntax errors in description and add more manual tests