Cleaner way of fixing issue #35
Implemented microtimer issue #50