Merge pull request #14 from willem4ever/master

Some additions to support the Whitelist
Fixed indentation