Merge pull request #62 from Express50/issue_1243