Updated per peer review and ready for beta release