Merged with In-progress-marker and added new AUTHOR