Fixed timer
Merge pull request #2 from HallCat/FactoryBranch

Fixed timer
Added changes to workstation
Merging master and remove conflict