updates
Merge branch 'master' of https://github.com/bigondis/cib

Merging from working on imgs