Add missing files; some minor changes
Merge branch 'master' of https://github.com/RGLab/COMPASS