Closes #17, Fixed #19