A pull-request with all the commits from @gabmurnio and me pushed till now.