Merge branch 'teddy' of https://github.com/urbansson/sip into emil
sum synchronized stuff yeah
Merge branch 'emil' of https://github.com/Urbansson/sip into teddy