SAFETY!!!!!!!!!!!!!!!!!!!!!!!
Merge branch 'tzuo' of https://github.com/tzuohann/MASTER into tzuo
added sample picker for Xt