Issue 138 (https://github.com/codingteam/horta-hell/issues/138)

[Issue 138](https://github.com/codingteam/horta-hell/issues/138) rebranch to devel; fixed submodule; flatten commits on a branch