Merge pull request #1 from djq/test_branch

Test branch
tidied up parser, and remove mad characters from text
Merge pull request #2 from djq/parse_improvment

tidied up parser, and remove mad characters from text
Merge branch 'master' of github.com:djq/flann into test_branch
Merge branch 'test_branch' of github.com:djq/flann into test_branch