Merge into master - Issue 68 manual timing #75

Closed boons605 closed 11 months ago