Made the surf platform compatible with latest head
Merge pull request #27 from avalon12/tp-master

Made the surf platform compatible with latest head