Merge pull request #69 from alanc/master