updates
Merge pull request #1 from snoweye/master

updates