BUILD STABLE; Added support for local gallery