Merge pull request #6 from polarpine/master

switch base