updates
Merge pull request #3 from Kevinljh/kevin

updates