Issues #108 and #109 solved