Merge pull request #609 from wozz/bitven