Merge pull request #1 from meteor/shark

rebase