Code style - Convert spaces to tabs, reformat code based on IntelliJ standards.
Solve merge conflict
Merge pull request #7 from jdersen/jdersen-patch-4

Convert code-style to tabs.