Mkchu dev

merge my changes ailments, pooling system, stopwatch, with master