Merge pull request #24 from raunakkathuria/master

Adding config for whitelabel
Release v2.5.2
Merge remote-tracking branch 'upstream/master'