Issue64

This fixes #64