Fixes #13 and closes #13