Merge pull request #4 from ciil/master

fix segfault
Project changes from Wednesday meeting 12. Novembre