Merge pull request #409 from BunnyRabbit8mile/next