Cleaning + solving Issue #12. Cf Issue #13 now.