General Update
Merge branch 'master' of http://github.com/gafas66/init