ip fix
Merge branch 'master' of github.com:ojle/conf