Added gem stuff.
Merged