Maintenancein progress

#15: #16 by Celil Bezeng | Raster