jmontleon Merge pull request #28 from djzager/update-base