qMerge branch 'master' into develop
Fix for #26
Fix for a problem with today index
Merge branch 'develop'