omac.entangle startup solution.
Merge branch 'master' of https://github.com/omacarena/omac.entangle.git