Fixed Issues #51 and #72.