don't erase from vector while iterating over it ( except you work on os x :/ )
Merge branch 'master' of github.com:matoilic/thesis
cleanup