Issue 4

closes #3