Update makefile
Fix bugs
Merge branch 'master' of github.com:k-team/xml-parser