merged changes from mespiritu