Merge pull request #3 from active-video/feature/forever

Feature/forever
Merge branch 'develop' into feature/forever

* develop: