Merge pull request #5 from ybjoony/master

added two variables to exchange, updated conversion function