added shareable gem, style changes
resolved conflicts