more and more housekeeping
Merge branch 'develop'