Merge some rendition for PR #20. Closes #20.