Merge pull request #1041 from syuusei3/issue39-ocpp2