Merge pull request #8 from polarpine/master

switch base again