Merge branch 'master' of https://github.com/bouskfil/SIP

Conflicts:
README.md