Small fixes..
Merge remote-tracking branch 'origin/master'
Adding date support.
Fixing tests problems.