Fix issue 17

closes #17