Update Base - fixes #31
Merge pull request #39 from RobLoach/update/base

Update Base