Merge pull request #1 from jrioux/issue-handling

Issue handling