Partially reviewed (up to SCR)
Reviewing done.
Merge pull request #39 from VizGrimoire/issue-38

Issue 38