Final commit to alpha branch.  Please add any new commits to the beta branch.