Merge pull request #141 from Useful-Innovation/johans-fixes

whitelist update