Tested and closed issue #17