Changed #3
Merge branch 'master' of github.com:mverteuil/garbage