Merge pull request #307 from rgrinberg/master

hlint suggestion
time 1.5 support