Merging Gawaboumga pull request (#27), fixes are coming Former-commit-id: 81079fd052538e15b7e919aea106cfb5a88a87a6