Merge pull request #14 from fgarbagnati/master

fixing weird merge issues
Merge pull request #15 from fgarbagnati/initial_setup

Merge pull request #14 from fgarbagnati/master