This fixes #3, and brings the code to be on par with the delopyed
versions of ScrambleSuit in terms of features.