minor changes
Merge branch 'master' of github.com:decolector/textilera
some local changes
fix conflicts