Updated from jscott

Changes from the Beta server