Synchronize both repositories

This pull is to keep both repos the same. It won't affect your repo when you merge one commit, actually it will go ignored @rainphp