Merge pull request #31 from karianna/master

More small POM and code changes
Fix HTML warnings
Correct English