Added
Merge branch 'master' of https://github.com/morengab/macadamia-cluster
Merge branch 'master' of https://github.com/morengab/macadamia-cluster