Issues #103 and #104 solved