Merge pull request #5 from Ramouch0/V2

V2
Update Mullins' style
Merge remote-tracking branch 'origin/master' into gh-pages