Issue 15

closes #15