Timestamp is in 2014-07-06 09:07:06 format closes #3
Merge branch '3_Timestamp'