changed a few functions.
Merge pull request #3 from cmivxx/dev-a

changed a few functions.