A fix related to #4 and a small change for #7