Resolved github issue #8