Revert "Remove -s from commands"

This reverts commit 0532c712c7fa62283ea41c70b0fa025d9887398c.
Fix issue #43