Updated author information
Initial merge to sync local git with remote git