Fixed apostrophe which interfered with Javascript
Synced code from master branch. Needed for testing.