wip
Winter'14対応
Merge pull request #1 from mino0123/winter14

Winter'14対応