Added option to specify use of charges from mol2 files.