segfault fixed
Merge branch 'master' of https://github.com/smiw314/ITP2