Merge pull request #2 from balat/master

Fix singleton_s
Add `make_from_s`.

Fix #4.
Merge pull request #5 from Drup/master

Add `make_from_s`.
Replace some assertions by regular exceptions (as they may be raised)
TODO: check whether to do the same for other assertions