waited way too long for first commit :)
Merge branch 'master' of https://github.com/ariroseonline/kinetoscope