few changes
Change for greater stability
Merge branch 'develop'