Finishing
Merge pull request #2 from zs000/second-version

Finishing