Merge branch 'dev' of https://github.com/ernestoacostacuba/wtm into dev