third commit
Merge pull request #1 from CliMz/Dev01

third commit