Fixed #17
Merge branch 'wip/2014' of github.com:megane9988/wp-d2014 into wip/2014