Updated maintainace to v1.5 + reviewd