added and modified
Merge branch 'master' of https://github.com/nullspeed/config