Beta version fixing some issues on new (temporary) development branch. Will be merged later.