Merge branch 'master' of github.com:spottradingllc/zoom into feature-faq