Sync changes from Codiad/Codiad master