bug correction
Merge branch 'master' of github.com:TomT0m/conf