Make error 95%
Merge branch 'master' of github.com:danbek/thesis