Merge pull request #1 from WRLin/master

again