debugged more
Merge branch 'master' of https://github.com/PICASSAU/PICASSAU