updates
Merge pull request #10 from mayosh/master

updates