Merge pull request #14 from LauraOniga/unstable

Code review
Merge pull request #15 from LauraOniga/unstable

Code review / Code styling