Merge pull request #90 from chdemko/master

Update code
Update Copyright