updates
Merge pull request #10 from snoweye/master

updates