Merge latest code of naguirre fork