Merge pull request #114 from concatime/patch-1