Fixes #32 and Fixes #38

Error caused by indentations, replaced with spaces and good to go.