Move the code closer to synopsis and more explicit Penn bracketing
Merge pull request #48 from Ruslan Shvedov.

Merge done locally.