Related to issue #1 - Optimization

Video loading time optimized.