Merge pull request #115 from polynickglot/master

Refactor TimeFactory to have getter/setter