Merged master
Fixed segfault