Fix bug
Merge branch 'master' of github.com:scalableinternetservices/Upvid