Merge pull request #15 from levfurtado/ldion

fixes #6