Refactoring. Updated readme. Updated demo.