Changes: add compatibility with maleo