Merge pull request #1 from kronenthaler/development

First functional version!
ADD error formula