Additonal changes in format and etc.
Merge the new additional feature. thx jungseba

Merge branch 'jungseba-addition'