Merge pull request #1 from bzfshop-net/master