Merge branch 'master' into 'master'

Fixed segfaults and improved code style



See merge request !10
2 jobs for master in 4 minutes and 10 seconds (queued for 1 second)