Merge pull request #7 from irushchyshyn/master

Evaluation module update
minor clean up changes
Indentation fix
Merge fix