Fix the issue #32 of the main repository

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