Merge pull request #1 from lazedo/master

updates