Code

Merge pull request #1796 from tokkee/sh/configure