MERGED version FEB282013