Merge pull request #6 from ysc0423/charlesy

from charlesy