Merge pull request #27 from krinkinmu/fastpath-opt