Merge pull request #64 from chunfantasy/FINALIZING

FINALIZING
Small fixes