fixed formulation
Merge pull request #48 from lewenhagen/master

fixed formulation