Littel changes
Merge branch 'master' of github.com:aarkerio/marafiki