Merge pull request #1 from goshx/master

..
Merge pull request #2 from LIESMARS/master

Merge pull request #1 from goshx/master