updates
Merge pull request #7 from pashka4281/master

Paul's updates according to email