Big changes towards v2.5. Fixes #3, #4, #5, #10, #11 and #12