cosmit
Merge pull request #1153 from dengemann/gsoc

GSOC cosmit