Merge pull request #19 from fgarbagnati/master

fixing weird merge issues