Merge pull request #97 from zeldin/master