Fix the issue #32

Also change all the tabs indentation for spaces to accord to PSR.