Merge pull request #12 from fgarbagnati/master

fixing weird merge issues