Merge pull request from brainless/prep-for-alpha-launch Prep for alpha launch