Formulation and small edits
Merge pull request #12 from Shahor/source

Formulation and small edits