AlaxZan pullrequest 43ecb64