Merge pull request #2 from lothian/master

sync with lothian:S2I2
added missing scf -> scf.cc dependence
Merge pull request #9 from evaleev/master

sync with EV fork