fix getOptions()
Merge branch 'develop'