Merge pull request #1 from bzfshop-net/master

Rebase from 1.0.1