Added feature in #104