Made annotations more interesting & fixed timestamp bug
Merge branch 'develop' into gh-pages