Add more tasks based on casamenteras.com/checklist
Merge branch 'develop'