Added demo, refactored plugin a bit