Feature/1 twospaces

Accepted by Mikel to merge pull request associated with Issue: Indenting and spacing #8