MErge changes from laureano fork