Add new features based on Issue info.
Merge branch 'master' of https://github.com/jnf/blinder
Merge pull request #20 from brennx0r/master

Features Add