chronon Merge pull request #1 from zmonteca/master