fixing the the previous commit :p
Merge branch 'master' of https://github.com/martflu/amanaman