Better demo added. Small improvements and fixes.