minimal changes
Merge branch 'master' of github.com:preinh/pshab
prepare to upload on gitlab