minor modifications
Merge branch 'develop'
minor changes