resolved : issue 66 and 65

hi charles.
here are the changes for issues 66 and issues 65.
chears