Preparing next version (not yet released however, but stable enough to use master)