Fixed default argument for draw()
Merge branch 'develop'