Issue5

This fixes #5