Merge pull request #4 from zr2d2/master

Small contact refactoring.
security update to 3.1.10