Merge pull request #8 from sirriperek/master

updates on video uploading flow
code clean up - new helpers created & TODO section needs to be fixed soon