updates
Merge pull request #1 from Webxity/master

updates