Issue 24

@njam Please review.