Add Berkeley specific things.
Update based upon code review.
Merge pull request #4 from jordandukart/7.x

Add Berkeley specific things.