Final modifications. :)
Merge branch 'master' of github.com:josago/NLP1_2014