Started a new branch to mantain the code under development (probably not stable and even, sometimes, not building)