Merge pull request #2 from winghouchan/master

Push commits from winghouchan:master
Fix formatting issue
Merge pull request #1 from Forest-Design/master

Fix formatting issue