Merge pull request #4 from Nim0/master

Corrections.