Edited version and name. Added author.
Merge remote-tracking branch 'origin/master'