Merge pull request #21 from OresteVisari/dev

[Cleanup] spaces and indents