Merge pull request #1 from freude/fitting

Fitting
commit_from_pycharm