Resolved github issue #6