Changed current day indicator and added support for any year.
Merge branch 'master' into gh-pages to add other year support