first commit with some addaptations
Merge branch 'master' of github.com:moiatgit/awesome