update to latest source after standardcpp merge