Issue 3

Implements issue #3