committing MAC timestamp fix
change 1
change 2
Update main.cpp
Update emessage.cpp