Merge pull request #9 from tokkee/sh/next