Preview module now OOP
Preview module with render method
Preview module with render method
Merge remote-tracking branch 'origin/develop' into develop