Issues #105 and #106 solved