Merge pull request #17 from fgarbagnati/master

fixing weird merge issues