Changes in #4

Changes proposed in #4  have been resolved.