Merge pull request #11 from koxon/master

Major update - Working version (VIDEO)