Merge pull request #14 from fgarbagnati/master

fixing weird merge issues