Merge pull request #97 from tokkee/sh/swap