Adresses issue #17