Fix encoding issue
Fix string representation
Update Makefile