updated readme + authors
updated readme + authors
unit test
Merge branch 'master' into paste-diff