Trailing white spaces vacuum
Merge pull request #34 from tancnle/master

Clean up white spaces and correct indentation