Made Articulation into an atom.
Merged master.