Merge pull request #17 from fgarbagnati/master

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

Merge pull request #17 from fgarbagnati/master