Fix potential bug on history event
Fix pincode plugin
Merge pull request #50 from zoic21/master

Merge from master