Fixes #21 ch5 e8, p=2
Merge pull request #26 from asadoughi/issue_21

Fixes #21 ch5 e8, p=2