Merge pull request #1 from goshx/master

..