Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Unify Project Style
Merge pull request #492 from CodaFi/Style-Fix

Style fix