Merge pull request #1 from bzfshop-net/master

Pull request 2014/1/22