updates
Merge pull request #18 from snoweye/master

updates