I'm using the mac and systimestamp in our template now. Thanks for making these improvements !

Best,

Martin