Update: Added copyrighting and commenting
Update: Commit and merge