Adding stables
Merge branch 'master' into Stable
Re-did stable.