Merge pull request #12 from davel/davel/sqsh