Merge pull request #32 from nicferrier/master

a fix for a bug in s-format
Release 1.6.0