Merge pull request #92 from olerem/date-2016.09.16