Added defaults
Merge branch 'develop'