Merge pull request #1 from wilbertom/master

Import base