last fixes
Merge branch 'master' of https://github.com/jwanglof/TDDD49