Fixes and closes #19.