Issue 16

This issue has been fixed.
Please review.