bugfix + cleanup scripts
Merge branch 'master' of github.com:jpavel/cms-ucl-tau