more decent icicle config
Merge branch 'develop' for icicle