Merge pull request #13 from fgarbagnati/master

fixing weird merge issues