Added proper demo folder + new todo + various improvements
Merge pull request #3 from mawrkus/various_improvements

Added proper demo folder + new todo + various improvements