Updates _
Merge branch 'master' of github.com:diefenbach/Djaneiro