Merge pull request #7 from gatespace/_s-commit-288e5ba

Merge: _s commit [288e5ba].