Merge pull request #2 from Heart-Code/develop

CRP-6