updates
Merge pull request #3 from koxon/master

updates