Merge pull request #192 from ricardotk/wip

[Time] Add and fix features
[Bookmark] wip