Merge pull request #16 from Negusbuk/master

various fixes
Merge pull request #17 from Negusbuk/master

added combined fit