Thor Revert "Revert "clone from zako's https://gitorious.org/mbcx/mbcx""