V1.1, fixes #117, fixes #118