Merge pull request #55 from deanh/master