Merge pull request #6 from daisieh/bug_3380