white-list additions
Merge pull request #224 from NICTA/white-list

white-list additions