Based on jorisv/Tasks.git