general modification
Merge pull request #1 from haniepark/master

modifications