updates
Merge pull request #1 from lkrids/master

Updates