Added limited general-basis and ECP
Bug fix
Broke non-ECP case by accident
Merge pull request #2 from leeping/master

Added limited general-basis and ECP