Minor changes have been made to conform freedesktop.org