fixed line following
Merge pull request #3 from jimmyhlee94/jimmys-branch

fixed line following
fix merge