Merge pull request #1 from WStars/master

edit by wstars