Merge branch '0.0.3-stan' into 0.0.3-ergon