Further improvements on toolbox
Merge branch 'master' of https://github.com/vcarbune/crowdsrc