Merge pull request #54 from Bombe/issue-1227