Updated for stable release