Merged changes, ran CodeKit
Added language id to wrap hook