Replace mixed spaces to tabs and make sure everything is indented correctly.
Merge pull request #508 from neojp/master

Replace mixed spaces to tabs and make sure everything is indented correcly.