CMS fixed
Merge github.com:voltrue2/GraceNote