Merge pull request #1 from sentora/master

Update