Merge pull request #23 from talw/master