Fixes and closes #1.