Merge stuff 

Changed author information
Changed copyright information