Create the class with test and demo
Merge remote-tracking branch 'github/master'