Initial commit
Fixed indentation.
Updated style
Merge remote-tracking branch 'origin/master'