#2 adding config option
normalizing whitespace
#2 adding conditions for timestamps