Merge pull request #1 from lazedo/master

updates
Merge pull request #2 from lazedo/PR

Merge pull request #1 from lazedo/master